| commit | e0c8330afa4dfd599f3ab8cd95d45b63068ece9e | [log] [tgz] |
|---|---|---|
| author | Alex Ruiz <alruiz@google.com> | Thu Aug 27 11:16:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:16:11 2015 +0000 |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | 306965bc51220bc8673e336a9d5057d14b850cc8 [diff] | |
| parent | e66f8717169106a9bd1c8f20a3a36d2dac5a6fe8 [diff] |
am e66f8717: (-s ours) am 913cd98d: am e715ac6c: Merge "Removed checks for null that introduced bug." into studio-1.4-dev automerge: a58b9f6 automerge: 82178ea * commit 'e66f8717169106a9bd1c8f20a3a36d2dac5a6fe8':